From a46058451ec1349e0c446201cb825651eed40005 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Fri, 18 Mar 2016 19:05:20 +0100
Subject: [PATCH] High Contrast: stronger entry focus indication

---
 gtk/theme/HighContrast/_drawing.scss             | 4 ++--
 gtk/theme/HighContrast/gtk-contained-inverse.css | 6 +++---
 gtk/theme/HighContrast/gtk-contained.css         | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gtk/theme/HighContrast/_drawing.scss b/gtk/theme/HighContrast/_drawing.scss
index 4c4375bb57..8962706700 100644
--- a/gtk/theme/HighContrast/_drawing.scss
+++ b/gtk/theme/HighContrast/_drawing.scss
@@ -58,8 +58,8 @@
   @if $t==focus {
     border-color: $fc;
     @include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
-                      inset 0 0 2px 1px mix($fc,$base_color,20%),
-                        $_entry_edge);
+                      inset 0 0 0 1px $fc,
+                      $_entry_edge);
   }
   @if $t==insensitive {
     color: $insensitive_fg_color;
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index b52465137c..bf886305c3 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -194,7 +194,7 @@ entry {
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
     border-color: #aaa;
-    box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #303030; }
+    box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 0 1px #aaa; }
   spinbutton:disabled:not(.vertical),
   entry:disabled {
     background-color: transparent;
@@ -230,7 +230,7 @@ entry {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #360e0e; }
+      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 0 1px #cc0000; }
     spinbutton.error:selected:focus:not(.vertical), spinbutton.error:selected:not(.vertical),
     entry.error:selected:focus,
     entry.error:selected {
@@ -245,7 +245,7 @@ entry {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #3f260e; }
+      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 0 1px #f57900; }
     spinbutton.warning:selected:focus:not(.vertical), spinbutton.warning:selected:not(.vertical),
     entry.warning:selected:focus,
     entry.warning:selected {
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 217c9b44c3..e72e21a039 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -194,7 +194,7 @@ entry {
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
     border-color: #000;
-    box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
+    box-shadow: inset 0 2px 2px -2px gray, inset 0 0 0 1px #000; }
   spinbutton:disabled:not(.vertical),
   entry:disabled {
     background-color: transparent;
@@ -230,7 +230,7 @@ entry {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #f5cccc; }
+      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 0 1px #cc0000; }
     spinbutton.error:selected:focus:not(.vertical), spinbutton.error:selected:not(.vertical),
     entry.error:selected:focus,
     entry.error:selected {
@@ -245,7 +245,7 @@ entry {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #fde4cc; }
+      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 0 1px #f57900; }
     spinbutton.warning:selected:focus:not(.vertical), spinbutton.warning:selected:not(.vertical),
     entry.warning:selected:focus,
     entry.warning:selected {
-- 
2.30.2